Merge "Add flags to bsdiff main to generate the Endsley format." am: aa3cb25c11 am: db3afbd069 Change-Id: Ie2059ed3f1b3898a1961f8e9f9037f4ffaffc88a